Fix 2007-08-21 merge conflicts.
authorJuri Linkov <juri@jurta.org>
Wed, 22 Aug 2007 23:45:47 +0000 (23:45 +0000)
committerJuri Linkov <juri@jurta.org>
Wed, 22 Aug 2007 23:45:47 +0000 (23:45 +0000)
commitfa8345ab87f02a0dd401b880cb81627eb920ba97
tree11660fdee5817d965a016e12a6f4f77c12295c90
parent97166ffa3a30e8f26e0765456bd84b2e0b6400d9
Fix 2007-08-21 merge conflicts.
lisp/startup.el